From 25bf934c38875be831ceac2e77053b46af919830 Mon Sep 17 00:00:00 2001 From: "Jan D." Date: Fri, 8 Jul 2011 10:42:58 +0200 Subject: [PATCH] * nsgui.h: Fix compiler warning about gnulib redefining verify. --- src/ChangeLog | 2 ++ src/nsgui.h | 5 +++++ 2 files changed, 7 insertions(+) diff --git a/src/ChangeLog b/src/ChangeLog index a84a866bf42..20ec6f3f1a5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,7 @@ 2011-07-08 Jan Djärv + * nsgui.h: Fix compiler warning about gnulib redefining verify. + * nsselect.m (ns_get_local_selection): Change to extern (Bug#8842). * nsmenu.m (ns_update_menubar): Remove useless setDelegate call diff --git a/src/nsgui.h b/src/nsgui.h index a6955630941..999dc27e310 100644 --- a/src/nsgui.h +++ b/src/nsgui.h @@ -30,6 +30,8 @@ along with GNU Emacs. If not, see . */ #undef init_process #endif /* NS_IMPL_COCOA */ +#undef verify + #import #ifdef NS_IMPL_COCOA @@ -44,6 +46,9 @@ along with GNU Emacs. If not, see . */ #endif /* __OBJC__ */ +#undef verify +#undef _GL_VERIFY_H +#include /* menu-related */ #define free_widget_value(wv) xfree (wv) -- 2.30.2